minor test fixes and changes to some rest testing