Applied some concepts behind my other component system tests here: 
hope it actually improves performance and doesn't screw up existing projects