Fixes the bugs with deck tests

Reported-by: bnurbekov
Signed-off-by: Batyrlan Nurbekov <bnurbekov@wpi.edu>