Fix tests to account of salve.util refactor

These tests were broken WRT their handling of the utils, still using the old
locations for many modules and functions.