Refactor some future common test object creation
Fix non-test function name (nose discovered it)