Fix tests
Improve customer views
Fix array range