Fix running of unit tests