fixed building and unit testing for 5.1
renamed macro parameters to fit original