Remove more deprecation warnings; some test nits

very cool, did not know about that. pushing now