Notes
Description
With all of the test in green and passing state, let's take time cleanup and refactor parts of our test suite.