Fixed some naming issues with new tests.
Fixed all tests that broke due to the change of the object testing approach.