Removed redundant code. Added test cases for other holes.