Rearranged piece layout on board for setup of testing battles. Refactored tests to reflect adjustment