r26608 - Refactor testing to be consistent and clean up after itself more by ga

Top