Fixing test build