Fixing double click bug and it's test