Added some tests, cleaned up and improved a bunch of stuff
Added operator+ and operator++