Reverted back to different import format, preventing tests to be run in onepercentclub-site