fix tests
new folders structure