Re-enable unit tests. Forge fixed their stuff
Merge remote-tracking branch 'origin/master'