minor changes on packages and test cases