Added integration tests, empty classes