Fixed some broken tests. Still need to verify RequestHandler.