Increase integration tests readability
Organize tests into appropriate folders