Writing tests for #34