Test fixes + changes due to implicit code review.
Merge origin/master