Updated BasicBlockDetector and CFGDetector.
Adding test code