changes to support testing