kozai
fixes various issues with mercury test