Implemented unit tests for existing tests