Fixed rest of the test cases frappe/frapp#478