Adding tests for #212