Cleanup testers and make them more readable