minor alterations to packaged macros, py.test updated tests