adjusted tests to reflect latest changes