Minor formatting + working on the test helpers