General update and tests