Fixed unitTests to use new API