Remove more deprecation warnings; some test nits