Cleanup tests a bit
Getting over my irrational fear of multi-line return statements