Remove depricated factory <2.0 parameters. Adopt part of tests