Fix references, update TestSuite