more tests
changed structure to make it flat