Moved some of the obnoxious testing stuff