Polished makefile for test2 further