Test is Remove workaround will work