ALL tests are now passing!
Fixing some issues with regards to short keys and proper index blocks