Update Unit Testing due to changes