All working tests now use the current API style. Other test comment out