Mainly using correct niem tags and mocha tests