added extensions check
updated tests