Reomved depreceted classes + migrating tests