new tests and style correct