Fix tests to account for changes incorporating Silica.