Fixed tests, modified expressions only valid in 2.1