Fix/test views

Merged DanmeiChen requested to merge fix/test_views into master

Merge request reports