moving scalar extrative where they belong and updating unit tests