added tests from master: layer selector and fix rivers