Fixes for makefile. Deleted more old test code