Test suite now working