Added some notes and tests to the refactoring exercise