Closes #5

Merge test changes by @lloydbenson