Add tests to Makefile.am and remove redundant references, standardize.