Add tests to cover #73