Started making changes so that the tests will be less verbose