DRY, polish, enhance tests