Documentation extended, testing extended