A couple more tests & fixes