#130 - Reduced and consolidated calls to DB and get only what we need, when possible. Added and fixed some tests
Merge pull request #205 from brunck/Issue-130

#130 - Reduced and consolidated calls to DB and get only what we need, w...