Update Makefile for tests to reflect currently recommended style.