Fix functional tests. Added 'test-*' class hooks to avoid future breakage