add mail test and use findById instead of fineOne