fix unit test
remove use of deprecated class
fix unit test