Move up local_options check.
Adding new test cases for unique_mapping.
Merge pull request #114 from sunyc/master

Prepare for alpha6