Remove unused test code
Refactor integration tests