Unit tests updated to new API