Updated test cases and package structure