Fixed unit tests
more unit test fixes
further cleanup to plugin definitions
Minor cleanup to whitespace and layout