Add tests and move preloaded consumption calcs