Add some tests from kshe48@zoho.com. Currently failing, but will be fixed soon.