More tests and refactored issue collection
Merge remote-tracking branch 'origin/complete' into complete