Some more documentation, updated tests