Attempt (yes, attempt) to fix unit tests