More restructuring of tests.
More restructuring of tests.

pleroy/Principia,mockingbirdnest/Principia,pleroy/Principia,mockingbirdnest/Principia,pleroy/Principia,mockingbirdnest/Principia,pleroy/Principia,mockingbirdnest/Principia