modified test and makefile for working amalgamation