Fixed tests for sf 2.3