Flesh out tests a bit more, mostly complete now
Clean up docs a bit