Added another integration level test, refactored integration tests.