Adding some tests from Jamie