Merge "Update tests makefile for change."