Removed all workaround tests