More tests 'n stuff
0.0.4