Changes for new test