made more test friendly