Adds tests for issue 1464