fixed failed tests cause of modified testdata and minor bugs after
refactoring