Add test Makefile. Cleanup tests and setup.