added more tests, we should be fine test-wise for a while...
Merge remote-tracking branch 'origin/master'