cleaned up test framework
cleanup