test-examples refactor