Update test shims
Remove outdated code
Tighten up tests