Small tests/examples cleanup