Comments and test updates