Add views & tests