Refactor value calculation method, test force_step support