some more tests & organization