more plugin tests
Merge commit '8c66fe328dc58e3993bafe893d4f8482887b287b'

Conflicts:
	tests/test.py