added erlson
fixed tests