Updated tests and such. v 0.1.3 ready