Removed unused packages, fixed tests