Fix unit tests to account for 2feef29