Corrected failing tests

Improved object mothers