Fixed trial period marshalling issue, added test