Changes for new tests