Updated test cases and config file