Add tests for #36