adding testing module and updating classes
Adding the rest testing parts