Correct tests and moment scoping