Breaking away from MEF
Adding testing
Trying to get tests running - no luck so far
Merge