Fix test: reference button by class
FB: Fix close button