adjusted tests for new changes