fixing deprecated stuff, adding plan to tests