Fixed Unit Testing phase