Josh: Update tests, and update main plugin