Updated views & tests