#130 - Reduced and consolidated calls to DB and get only what we need, when possible. Added and fixed some tests