Fixing unit and integration tests