AKD: Minor fixes and fail-test addition

Signed-off-by: Michal Novotny <mignov@gmail.com>