Minor improvements; add another challenge test key.