Added some fixes for Customer + TESTS TESTS TESTS