Updates and units tests