Fix tests, delete unused request handlers