Test suite now mostly setup