clean up of test implementation