[Xnee/f18] Add test suite and undo previous fix

[fantom]

Summary of changes:

  112210b... Add test suite and undo previous fix (*)

(*) This commit already existed in another branch; no separate mail sent