Tests are now working, re-enable.

@rev jbuchanan@
@bug W-2415403@
Merge branch 'kgray/master-pending-enabletests'