Re-organize tests
No need to specify dir