Renaming stuff to deckard
Updating test