Added new Chicken macros, adjusted tests