updates to get tests to (finally) pass