Fixed tests and line lengths