update regexes to allow source maps on same line as code, add/edit tests