re-architecture of the views and the tests