Fix the breaking fps tests.
Fix the breaking fps tests.

biddyweb/merchant,biddyweb/merchant,spookylukey/merchant,digideskio/merchant,mjrulesamrat/merchant,digideskio/merchant,mjrulesamrat/merchant,agiliq/merchant,agiliq/merchant,spookylukey/merchant