Tweaks to get tests to run