Crunch out TODO: testContrivedQueensideCastleScenarioWhite.
Merging some tests.

testContrivedQueensideCastleScenario will now also test that the board is in the
expected configuration after the Queenside castle move has been requested.
Unit test clean-up.