Fixing unit tests and skipping integration tests for maven build