pull out tests while I figure out how to make them work correctly
merge master
Merge pull request #176 from nla/amberconfig

pull out tests while I figure out how to make them work correctly