Helpers for testing
Start refactoring tests into their own files.