More tweaks to get tests always passing