PC optimization refactoring (Only unit tests. Missing IT tests refactoring.)