Amended tests to achieve 100% code coverage