Testing and fixes

Signed-off-by: Adeel <adeeltariqagain@gmail.com>