Improved testing and test report comments
- also removed duplicate function