Fixing some stuff, namely unittests