Unit and feature test fixes.