Updated submodules and imported cmake testfunctions from firefighter branch