added tests and views