Refactor NIE tests
Add method to interface
Rename field and methods