This approach should simplify the testing methods.