Upgrade of the main class (CGasStation) with TestClasses