Expanded Makefile to include two pass test, with and with out server