Updated test for new API, currently broken