Minor hack for "after" working with views
Fix tests