better plugin support and better plugin tests.