Modified tests slightly and uncommented the ones that work now. Also, deleted the test that didn't make sense
@rev ctatlah@
@bug W-2340868@
Merging origin/mike/master-pending-addFixTestsForButtonFix into master