Tidied up some tests
Combined IHandler and IRenderer by introducing IRenderer<T>