updated tests and views