Cleaned up some of the linting errors that lead to tests failing