Cleaned up the Makefile.am and enabled the extra gtest tests