fix unit tests, a lot are broken