Fixed tests and views