Rewrote test makefile