Clean up test code
Add StrawPluginRegistry tests