Updated version to express 4, fix test cases
Merge pull request #3 from bihe/versions-cleanup

Updated version to express 4, fix test cases