Fixed tests after @natefinch comments