Minor refactoring for readability
Rearrange tests and configure better test output