Working on more documentation and adding more tests