first commit of the Closure test code and macro. also added the dps stuff