Temporarily killed some of the tests. I need to solidify my testing plan.