update 1.245

did some test refactoring
resolve conflict