Added tests from Tom