CustomerModel Test ready and some other small changes