Added nw files, cleaned up stuff and got the tests working again
Merge branch 'tests' of https://github.com/AdamKyle/Aisis-Core into tests