Merge pull request #983 from eileenmcnaughton/apitests