refactored to simplify
vastly improved test of activity serialization
fixed jackson mapper configuration issues causing better tests to fail