Formatting fixed based on Keir's comments and extended the tests
2 files changed