test modules in separate file, rewritten Makefile