Follow-up on review

Changed back `assert.equal` to `assert.strictEqual` + some more minor changes