Removing unused packages
Fixing tests
Bundles tests still a problelm