Adding tests for #34