Checkpoint

A few corrections and some temporary test exclusions