Updated tests to latest api changes