Bring tests up to current code