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

...hen possible. Added and fixed some tests