add simple consumption calc for cases + more tests (some failing)