Adjusted tests to latest changes