AccountDao improvements and test added