Add tests for #121