Get example building and tests passing again