Updates and testing