Split plugin test. Minor bug fixes