rollback fixes more @key headful and sample tests
2 files changed