Start supporting faceless decks
Fix unit tests