Code

Cleanup of out-of-sync tests