Make tests pass without deprecation warnings
Merge pull request #257 from cpennington/remove-warnings

Make tests pass without deprecation warnings