More source-map generation refactoring
More test cases added