Added more test cases and fixed their order and references