Remove tests and update fetch to match newer code