Improve tests using helper