Made changes to make tests pass, and make the output less verbose.