change/fix things I disagree with
Merge pull request #24 from chandracarney/test-refactor

change/fix things I disagree with