Reorganizing code and adding test cases for Rook and Bishop