* More unittests
* Swapped target<->excpected in asserts (d'oh... I *always* mess this up...)