views and tests updates