Fixed tests to match new behaviour