CHANGES updated; test fixed