More test cases, fix regression.
Bump version to 0.4.7