Refactored testing solutions