Fixed (or removed) tests broken by new functionality.