Fix small issue & remove deprecations in test