makefile & tests cleaned up