Fix rubrics, strip out get results
Fix test, strip out more of show results