Mocked out remaining helper methods and tests