Update examples and fix bugs found from tests