test msk programs: fix makefile (include moved) & add debug/close properly