fixing some linting/testing issues