Rebuilding tests for new API