Added tests from Jeffrey