updated the tests suite, came up with some more tests, and made a more suitable diversion of the tests..