Update unitary testing. Can just load data if need to., adjsut paths
Update unitary testing. Can just load data if need to., adjsut paths


Former-commit-id: 8cc5afa6723d5fb625cdcf132af3e0763f0edf06 [formerly 23f71c63fd42c9774abf259595b4fdb0d0aa201d]
Former-commit-id: 594425fe3497d0e0cfeab08cb96566d0213bce11
jason-neal/eniric,jason-neal/eniric