Some improvements for general sphinx test.