Fix merge workspace test