chore(tests): update and refactor
- update views
Merge remote-tracking branch 'origin/0.4' into 0.4