Updating makefile and qtcreator project with combined tests