Merge pull request #19 from jlambert121/master

add acceptance testing, ensure class parameters propigate to defines