gkeys: Clean up logic and pass/fail tracking code