Attempting to fix unit tests in 5.4/5.5.