some tests and some fixes for nats/quads