Add tests for #34