Adding tests for #236