Added self-tests for all steps in exercise