Moved test utilities around - still working on getting 100% coverage in travis.