Test Bulk
Some style cleanups (removing _ in vars, etc...)
lint fixes related to error messages