add tests and reactivate findAll XML