Split up ns

- Added tiny test