Hot fixing issues.
Enhance headless test cases.
Chaging version to 2.1.31-SNAPSHOT.