AbstractTest cleanup
refactored