changes to structure to make tests run smoothly