Updated Makefile test rules
Coding style