Added tests for 61f5df9