Make tests pass & update examples