some test fixes now segfaulting