addressed linter issues, fixed broken test