Fixing workspace tests