updated macro names - use-barrier to use-nbc, also added provisions to use wait instead of test in nbc version