Test and code update