This helps organize the tests better. I also renamed several of the tests to remove redundant dead-code in the path, and better match what they're testing