New test macros. Protocol implementation improvements.