Revert changes to gear functional tests