Unittest fixing