Refactoring of APIReader (removed cruft) and two news tests in APIReaderBehaviour.