Merge "Clean up the Makefile for recovery and tests."