some fixed and tests running