Fixed comments, renamed tests