Instead of switch branch test, I fix some error for test in branch dev, not cool and not recommended, I know...