restructured tests
added more tests