Update views for better testability