WIP refactor Assert.js changes