Test changes, logic corrections.