Testing: tweaks to make mental/speed behave better