Added options passing and new expected files. Everything looks good =D