fixes according to CR
minor test fixes