Modifing the Makefile.am in tests for the new nbuild structure.

Change-Id: I50956dcb294b23a60eadbd139cd576a81be24ed9
Signed-off-by: dekehn <dekehn@gmail.com>