Improved test method detection so I could move the tests back.