Fixing unit tests
Removing remaining integration tests