Adding tests and some other stuff.