adjusted test cases due to recent code changes