Added passing tests for #616