finished charges test, started customers refactoring