Better directory structure
Reflect structure in tests
more tests
model users test
Nested tests