bug correction
Started converting test into diffrent classes and modules
Small changes