minor test changes
minor test fixes