These tests probably should have been in 1001724