refactor integration tests - #7