tests fixed; variables amd module normalized;