Requires !833 (merged) Just some general test restructuring to make testing more uniform across the project.