updated some new views and add/fixed tests