Fixed tests to account for changes in c51f42a1db1fa1ce66f4c8ed1ded9ba303984a04