Refactored testing one, two, and three