Refactored-- assertions in tests are failing (but usage does not throw)