Tests for --no-topology
Replace library w/ native calls, etc.
Improve layer names when using --combine-files