fixed all the tests - super green