fixes tests
updates composer.lock
updated use statements
renamed some classes to have different names