Remove split test and bump version to 2.

Change-Id: I6c953779c62cfbffaa5cb82eaeaebadbc738fcdf