initial changes for new tests