Initial SF/SI 4

More
@Ignore 2 Tests

Two tests don't run under Spring 4; needs investigation.