Update tests to use underscore and enable Trevic-CI feedback