second try with 5 tests

Eclipse died, committing. Second try, enabling tests in different order
and sticking to primitives as far as possible.