improved Be_Whole macro, added test for macro