Fixing build for tests
Removing unnecessary changes