Fix up spork tests