Moves production code out of test package