Completing the unit tests