Fixes for test games 3, 5