rewrote tests that used deprecated methods