Added views and tests