modified test file for added tests, revamped exercise