Fixed REMOVE_LAYERS option, improved testbed.