Actually provides tests for #21