Removed old approach to compiling canonicals.
Added extra test of workers
Small tidy up