Update tests and views