Make unit tests work