Adapted the unit test Makefile to the directory structure change.