UserPackage added
Made some changes
Added test class