changes to speed up testing