Unittestified a couple of tests