Modifying the logic tests. Changing some method names for clarification.