Fixes for controller handler and uneeded inclusion of php compat for tests.