Dependencies, cleanup on tests/examples