Removed old tests. Updated Makefile