Get example compiling and tests passing again