Merge "Try to add some more documentation to testables"