Finished testing

Will merge this branch into Workbench.