Updated dependencies
Moved class loading to methods to avoid phpunit adding it to a suite