bugfix
normalize & factorize tests