Latest tweaks to Makefile and added missing client test program