layers: Fix some merge-related issues in demos and tests
2 files changed