Added views and tests for them.