Working on test fixes