More nesting tests and some misc