Alters customer user test to work with empty DB; Some changes to customer/user objects; new apiKeyType model