Add tests with fix for issue52.