Added few more test stuff