Changed some classes and tests