Update all failing tests

@ericvaandering as discussed over IM