several fixes in make structure, readded testingx