Refactor spec component_spec
Change to watchr
Refactor spec
Refactor component_spec

    Less code for more functions