Added few additional testing scenarios."