better support the old test cases