Address comments from pull request, clean up tests