Restructured tests for readability and speed