Added tests for #37.