further tests
Cleaned up and revised the tests