Re-arranged and re-documented test sections