Added tests for 31-39