added header files at severel places, tests fail, searching for reason