Failing tests for #46
Pass failing tests for #46