Tweaked some unit test examples to make more sense ... nothing major :)