create new Test T025, refactor a bit