Fixes #86. Mirror master test exactly.