Minor changes to make it possible to run loops in BoardTest
Merge remote-tracking branch 'origin/master'