fixed tests

forgot to change tests after behaviour change, sorry kevin.
Merge remote-tracking branch 'origin/master'