More Tests on Everything Requirement
Test Coverage up to 59.1%