added BIND macros, updated test