modify tests according to PR comments
remove commented code according to PR comments
moved properties according to PR comments