Imlemented unit tests against new API