added new classes and test steps