Adding a couple more tests from ferris2