fix @with... macro settings and assertions.  Almost all tests passing now