Aru - refactoring tests