updates fixes and tests