Fix unit tests (entirely)