Bug 956231 - only checking button 2, added tests