Test server improvements

This file name should be Makefile, capitalized.