Added 2 new integration tests and refactoring of existing tests