Added view handler and some tests