fixed tests
Merge pull request #830 from sghai/fix-test

Few fixes related to ak tests