New tests and bigfixes.