silly changes to get test suites to work