Removed old API, made all but one tests work with new API.