got rid of the race condition for customers; better formatting for test helpers