Fixed some names and unit tests that were not compiling
Now fixed