test and method cleanup