Fix naming, make test compile
Merge changes