Test optimization and comments