added test helpers etc.