improving generation tests