further improvements for static generic params; activate the hardest test cases