Removed some stale tests, updated/fixed others.