added more helpers to assist with unit testing