integration tests up to new files layout