tests and style changes