Fixed up tests
Temp mixups so tests could run