correct cfls title
updated macros and tests