Fixed tests to match code changes