Updated tests, views and stats