Fixing bugs with exporting functions (:) ). Upd. unit tests