tweaks to get tests to run