extending the tests a little
fixes and extending tests