views are more powerful now and tests fixed for new changes