Add test with Fancybox
Fix merge issues