ticket:3 Modify tests