Updated dependencies, renamed classes and improved tests