Simplyfyiing Makefile.am for tests.

using a proper variable for just-built unittests whenever possible.