Changes for constants on mac and addition new test sample