Fixed singlreordefault to firstordefault AND bugged unittests