remove all fix me
fix failed tests
Merge branch 'hotfix/remove_fix_me'

* hotfix/remove_fix_me:
  fix failed tests
  remove all fix me