Fixed lifting of parameters. Test adjustments.