Merge pull request #640 from valentinewallace/test-holding-cell-edge-case