adding a few more tests, restructuring