Add tests for issue 475 and 468.