fix ci errors and out of date fixtures

Signed-off-by: Geoff Pleiss <gpleiss@pivotal.io>