Finish tests of WorkspaceController; discard some redundant ones + improve code