Add tests to confirm #229, #230