fixing up unit tests affected by code refactor
moving WcatRunBehavior class to separate file
moving interfaces and classes to separate files
renaming class