Merge "Fix test makefile"