Fixes. Initial test are done.