more consistent code between tests