misc test fixes
Merge pull request #504 from ahgittin/fix/miscellany

misc test fixes