Addition all done and working
Moved tests into their own filesz