Updated to combine test suite coverage