Fixed some deprecated test issues