Consolidating test content loading into one class
consolidating test content into one class