Updates to get plugin test working.