fix merge error where tests passed with stale class files