Test refactor and nn change