* Fix the horrible hacking that is Catalyst::ScriptRole::Useage
* Fix TODO tests