added factories and refactored factory to account
Merge branch 'feature/add-basic-tests' into jose-romero