Add other coverage criteria and update ConcreteTestGenerator class