Bug 997673 - Refactor of cost control python tests