Add tests, basic.recover