Move tests into astrid module