Fixing tests to use straight API calls instead of commands.
Fix more tests.
Back to where we were with the tests.
Fix to the workspace menu.