Refactor integration tests

Files for integration tests have strange naming. We try to keep them consistent.

Closes #50.