Polish
Minor unit test fixes