Completing unit tests