Added consumer tests
Added component tests
Tidied up tests