Moved tests/code to two seperate files, current tests passing