Merge pull request #70 from pmienk/develop

Add test generation to Makefile.am, remove extraneous _LIBADD arguments.
reorganize some function-specific data types back into transaction.hpp away from the general primitives.hpp header.
Correct test expectation.