Documentation, cleaning up tests