Remove use of test method types