remvoed normalize helpers into normal module
reoder tests to reflect refactoring