Updated test cases and package