Fix and complete ALL the tests