More tests, but some of them failing due to recent changes.