Fixing unit tests, running integration tests