Added demo views and unit test