Adding AffixGuard to SharedHeapTest and misc. cleanup