Update source location and implemented tests.
Merge branch 'source-location'