Updating build system.
Fixing test Makefile.am.