clean up Test object to reduce duplication