Adopted some tests to the cleaned up Workspace entity