To meet changes introduced from the straight branch merge.
Easier to organize and write. Now I can hopefully strive for better coverage!