Updated tests and performed regression testing