Conflicts solved
Updated Workspace model and tests