* Get rid of block based key retrieval and just return from method
* Re-order commands now that we shred as soon as we read the key info into memory
* Make tests more lean to avoid repetition and better test commands