fixing tests, all green now