Adding some more generic tests
Merge remote-tracking branch 'origin/complete' into complete